Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 9 Jan 2006 14:43:46 +0000 (14:43 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 9 Jan 2006 14:43:46 +0000 (14:43 +0000)

Trivial merge